From b573dba9e0f2979c90ce88b5952cf59eddb612b7 Mon Sep 17 00:00:00 2001 From: Padraig O'Briain Date: Wed, 16 Jan 2002 08:53:15 +0000 Subject: [PATCH] Avoid unexpected warning message when navigating menu (#68517) * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Avoid unexpected warning message when navigating menu (#68517) --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkmenushell.c | 11 +++++++++-- 8 files changed, 44 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ade382500..7d3856aab1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-01-16 Padraig O'Briain + + * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): + Avoid unexpected warning message when navigating menu (#68517) + 2002-01-15 Jody Goldberg * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3ade382500..7d3856aab1 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2002-01-16 Padraig O'Briain + + * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): + Avoid unexpected warning message when navigating menu (#68517) + 2002-01-15 Jody Goldberg * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3ade382500..7d3856aab1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-01-16 Padraig O'Briain + + * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): + Avoid unexpected warning message when navigating menu (#68517) + 2002-01-15 Jody Goldberg * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3ade382500..7d3856aab1 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-01-16 Padraig O'Briain + + * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): + Avoid unexpected warning message when navigating menu (#68517) + 2002-01-15 Jody Goldberg * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3ade382500..7d3856aab1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-01-16 Padraig O'Briain + + * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): + Avoid unexpected warning message when navigating menu (#68517) + 2002-01-15 Jody Goldberg * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3ade382500..7d3856aab1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-01-16 Padraig O'Briain + + * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): + Avoid unexpected warning message when navigating menu (#68517) + 2002-01-15 Jody Goldberg * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3ade382500..7d3856aab1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-01-16 Padraig O'Briain + + * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): + Avoid unexpected warning message when navigating menu (#68517) + 2002-01-15 Jody Goldberg * gtk/gtklayout.c (gtk_layout_realize) : It is possible that a diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index ccd200b909..fd88cbfbbe 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -981,8 +981,15 @@ gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell, while (parent_menu_shell && (GTK_MENU_SHELL_GET_CLASS (parent_menu_shell)->submenu_placement == GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement)) - parent_menu_shell = GTK_MENU_SHELL (parent_menu_shell->parent_menu_shell); - + { + GtkWidget *tmp_widget = parent_menu_shell->parent_menu_shell; + + if (tmp_widget) + parent_menu_shell = GTK_MENU_SHELL (tmp_widget); + else + parent_menu_shell = NULL; + } + if (parent_menu_shell) { gtk_menu_shell_move_selected (parent_menu_shell, 1); -- 2.30.2